BackgroundMenu: fix regression from new background handling

BackgroundMenu must ensure the actor it attaches to is reactive, and
the layout manager must create a background menu for the first background
too.

https://bugzilla.gnome.org/show_bug.cgi?id=694227

diff --git a/js/ui/backgroundMenu.js b/js/ui/backgroundMenu.js
index 6b50c6e1bdd4c3da690069259f1a7ccf4ff426d3..806d89a2f3fba9032faf7ff5f4b8cb12cca07d62 100644 (file)
--- a/js/ui/backgroundMenu.js
+++ b/js/ui/backgroundMenu.js
@@ -31,6 +31,7 @@ function addBackgroundMenu(actor) {
     let cursor = new St.Bin({ opacity: 0 });
     Main.uiGroup.add_actor(cursor);
 
+    actor.reactive = true;
     actor._backgroundMenu = new BackgroundMenu(cursor);
     actor._backgroundManager = new PopupMenu.PopupMenuManager({ actor: actor });
     actor._backgroundManager.addMenu(actor._backgroundMenu);

diff --git a/js/ui/layout.js b/js/ui/layout.js
index a0fbbc8197b32b7390dcdd9ff31cd3b49890cc44..552e032c31864e4295cac5b1283f4935e58dc688 100644 (file)
--- a/js/ui/layout.js
+++ b/js/ui/layout.js
@@ -333,6 +333,7 @@ const LayoutManager = new Lang.Class({
         let bgManager = new Background.BackgroundManager({ container: this._backgroundGroup,
                                                            layoutManager: this,
                                                            monitorIndex: monitorIndex });
+        BackgroundMenu.addBackgroundMenu(bgManager.background.actor);
 
         bgManager.connect('changed', Lang.bind(this, function() {
                               BackgroundMenu.addBackgroundMenu(bgManager.background.actor);